DO NOT MERGE - Merge tm-qpr3-release TQ3A.230605.010 into tm-platform-merge Bug: 279962103 Change-Id: I2b65e4d0390b51bf17726432f2b623f250a307e0